Adwaita: rework places sidebar styling

set colors on rows istead of images.

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 3b5692a0f42e89b372836503e69293520a6fc320..ae2cd6dcbf5f8ab0a6e6ad27bfb8f954b02befb3 100644 (file)
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -3671,19 +3671,19 @@ placessidebar {
       padding: 0 14px;
     }
 
+    &:disabled { color: $insensitive_fg_color; }
+
+    &:backdrop {
+      color: $backdrop_fg_color;
+
+      &:disabled { color: $backdrop_insensitive_color; }
+    }
+
     image.sidebar-icon {
       opacity: $_placesidebar_icons_opacity; // dim the device icons
 
       &:dir(ltr) { padding-right: 8px; }
       &:dir(rtl) { padding-left: 8px; }
-
-      &:disabled { color: $insensitive_fg_color; }
-
-      &:backdrop {
-        color: $backdrop_fg_color;
-
-        &:disabled { color: $backdrop_insensitive_color; }
-      }
     }
 
     &:selected image.sidebar-icon { @extend %nobg_selected_items; }

diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index c6d2c6386c79c1d0832d5dab541780b08289b81e..d278f7bc2e35b7a4c97c918c197356b48ce6b25e 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -3800,18 +3800,18 @@ placessidebar row {
   padding: 0px; }
   placessidebar row > revealer {
     padding: 0 14px; }
+  placessidebar row:disabled {
+    color: #949796; }
+  placessidebar row:backdrop {
+    color: #949796; }
+    placessidebar row:backdrop:disabled {
+      color: #5d6767; }
   placessidebar row image.sidebar-icon {
     opacity: 0.7; }
     placessidebar row image.sidebar-icon:dir(ltr) {
       padding-right: 8px; }
     placessidebar row image.sidebar-icon:dir(rtl) {
       padding-left: 8px; }
-    placessidebar row image.sidebar-icon:disabled {
-      color: #949796; }
-    placessidebar row image.sidebar-icon:backdrop {
-      color: #949796; }
-      placessidebar row image.sidebar-icon:backdrop:disabled {
-        color: #5d6767; }
   placessidebar row label.sidebar-label:dir(ltr) {
     padding-right: 2px; }
   placessidebar row label.sidebar-label:dir(rtl) {

diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 5a40f3955847b70e32f52d74301bbe9ddbd26c56..f16f60464fdb03e1098070bae1055bb25ab8b593 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -3828,18 +3828,18 @@ placessidebar row {
   padding: 0px; }
   placessidebar row > revealer {
     padding: 0 14px; }
+  placessidebar row:disabled {
+    color: #8b8e8f; }
+  placessidebar row:backdrop {
+    color: #8b8e8f; }
+    placessidebar row:backdrop:disabled {
+      color: #c3c3c0; }
   placessidebar row image.sidebar-icon {
     opacity: 0.7; }
     placessidebar row image.sidebar-icon:dir(ltr) {
       padding-right: 8px; }
     placessidebar row image.sidebar-icon:dir(rtl) {
       padding-left: 8px; }
-    placessidebar row image.sidebar-icon:disabled {
-      color: #8b8e8f; }
-    placessidebar row image.sidebar-icon:backdrop {
-      color: #8b8e8f; }
-      placessidebar row image.sidebar-icon:backdrop:disabled {
-        color: #c3c3c0; }
   placessidebar row label.sidebar-label:dir(ltr) {
     padding-right: 2px; }
   placessidebar row label.sidebar-label:dir(rtl) {